Merge "Reapply nav hints when systemui crashes or killed" into qt-dev
am: 970d0be2e0

Change-Id: I9a9dc5403dca4ed842bff00035287a2efa2e15d7