Merge "Always show ScreenDecorations when in gesture nav mode." into qt-dev am: 92d7f42baa
am: 6a07469e23

Change-Id: I26827273c85818996ba3279047dd8d5615b1e8df