Merge "WaitForNegativeProximity stopped with power button." into sc-dev