Merge "Use nav frame height to differentiate quick switch vs edge gesture" into qt-dev am: 241c2e30 am: f5fdb160 Change-Id: I911c933b4ee0a053dd29dbcabf9e6c1c21e14e9d