Merge "Always show the battery percentage unless it is unknown" into cw-f-dev am: cd542213e8 am: f2fabc9926
am: b0686f88cf

Change-Id: Ib137ee61cac29057cdeddbe1e45a01098ec6dfad