Merge "Fix system UI break in some devices"
am: 19788abedd

Change-Id: I46611b172a94142a349d52008883c2beb1df490c