Merge "Update keyguard charging text to indicate wireless" into pi-dev