Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN" into cw-f-dev am: 5df216f209 am: 1831698768
am: 9fdeaff3e9

Change-Id: I2ecf7f2fe3dac404119b4154dd7f3fe4c3bb6e7e