Merge "Lower battery indicator on AOD screen" into qt-dev