Merge "Porting over keyboard changes from other branch."