Merge "Update layout for gesture navigation" into qt-dev