Merge "Revert "Revert "Fall back to default keyboard theme"""