Merge "Polish the keyboard quick switch view and border animation colors" into udc-dev