Merge "Correct padding for status bar icons" into cm-10.2
(cherry picked from commit 37d5a2a34d26dbdd2548674c06c8cc075300728b)