Merge "Omit NavigationGuard if the input method uses FLAG_LAYOUT_IN_OVERSCAN" into cw-f-dev am: 5df216f2 am: a7fdfa81 Change-Id: I002cfe0a272d9a133f751eb0df3ab5d555ebb5af