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

Change-Id: I7dbc00b86774ccb944a4f1c12ba92c381e63eaab