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

Change-Id: I8ef2a5de5ff83be475c41b1202950bfb953c348f