am 222aeaf3: am 18dea40e: am 1b730cb7: am 434d55e5: am 23ace013: Merge "Adjustments for find sensor screen" into mnc-dev

* commit '222aeaf301061bf0cc24b3400dadec1e1791ec80':
  Adjustments for find sensor screen