Merge "Revert "Revert "Fix no keyboard on N builds""" into nyc-dev