Merge "Fix crash when changing navigation modes" into qt-dev
am: 2abd554786

Change-Id: Id21c87dfb1816965a2a811a2ce4fd63b41cf5e29