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

Change-Id: Ic122e1c53c205bde9b9b7a4eac8b516f15e1ac9c