Merge "Adjustments for find sensor screen" into mnc-dev