Merge "Split keyguard dependencies out of ShadeViewController" into main