Merge "Add madia carousel lockscreen <-> shade transition" into main