Merge "Reload the Ambient Light Sensor on Display Change" into tm-qpr-dev