Merge "Make QS do simpler anim on lock screen" into nyc-dev