Merge "Fine tune what sensor use UI to show"