Merge "Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN" into cw-f-dev am: 5df216f2 am: a7fdfa81" into nyc-mr2-dev-plus-aosp