Merge "Fix smallClock and smartspace jumping when transitioning from AOD to Lockscreen" into main