[automerger skipped] Merge "DO NOT MERGE Add support for unprovisioned top nav bar" into qt-qpr1-dev am: 3008bb66c5
am: 12f00f2e65 -s ours
am skip reason: subject contains skip directive

Change-Id: I1d7b17e36b76042d448cb7b3443923dc724d9e49