Merge "Merge "Fix crash when changing navigation modes" into qt-dev am: 2abd554786 am: 93cc6add78" into qt-r1-dev-plus-aosp
am: b3689a4422
Change-Id: Iad6379d35a571c035b6ccfd2f632ee044588b527
This commit is contained in: