Merge "Resolve NPE for long click on Sensors Off tile"