Merge "Fix padding between battery and system icons" into lmp-mr1-dev