Merge "AOD: Keep brightness sensor registered while covered" into oc-mr1-dev