Merge "Always show the battery percentage unless it is unknown" into cw-f-dev