Merge "Fix nav bar leak in SystemUI" into qt-qpr1-dev am: d6e73ec8f1

Change-Id: I39643a2f6e7edc9af7221a295eb201cda3244534