Merge "Remove ShadeViewRefactor annotation and uses" into udc-dev