Merge "Move ShadeViewRefactor to right package to fix build breakage."