Merge "Reload the Ambient Light Sensor on Display Change"