Merge "Update layout for gesture navigation" into qt-dev
am: f99876e622

Change-Id: I614c37d03d8a34aa5624e16ff213052a0c787f76