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

Change-Id: I9fc68ca4a3c2a2b05e620d7b94cb3e6adef989cd