Merge "Removes auto-switch from gesture nav when default home app changes" into qt-r1-dev
am: 1051afbb38

Change-Id: I0cb3e98b6732c6e0e0c0cae709370874503783ef