Merge "Move listening to brightness changes to onStart/onStop." into oc-mr1-dev