Merge "Fixing keyboard theme selection"