Merge "Always show battery percentage on AOD"