Merge "Fix no keyboard on N builds"