automerge: 97f1a97 * commit '97f1a97d89366159374c2be3d74e0642705d80bf': Fix padding between battery and system icons