Merge "Remove some code from NPVC and ShadeViewController" into main