Merge "Increase size of the back/ime switcher buttons in gesture nav" into sc-dev