Merge "Update keyboard quick switch view ordering and add icons" into udc-dev