Merge changes from topic "p4_default_gestural_nav" into qt-dev
am: 1557fc99a0

Change-Id: I053e408c3deb6ad4815d522fe2fda33853526720