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

Change-Id: I9d9f8683d8b4ee7f61c680936e1869485d97872a