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

Change-Id: Ibf3c15cf1ecc0b3c87f566472c5f8a6907d4e1e8