[automerger skipped] Merge "DO NOT MERGE: Use status_bar_padding_top" into qt-qpr1-dev am: 27a0ee31b6 -s ours am: a12e7d94fa am: 58fb33f4fc
Change-Id: I004d019afd4629054db1b5520d9774f4f8e81bbf
This commit is contained in: