Merge "Add a lock independent check for internal display while logging manual brightness events." into udc-dev