Merge "Revert "Show battery percentage in QS header"" into udc-dev