[automerger skipped] Merge "Fix nav bar leak in SystemUI" into qt-qpr1-dev am: d6e73ec8f1 am: e06f253e8c -s ours
am skip reason: Change-Id Ic389a559a3d430af495365102854d531f7d1966d with SHA-1 52d938d31f is in history

Change-Id: I55eb8cda375f2ed75947d14beda0e8a36f3031ad