Merge "NSSL: Smooth transition from shade->lockscreen" into main