Merge "Use nav frame height to differentiate quick switch vs edge gesture" into qt-dev