Merge "Fix bug with portrait-fold devices animating app pairs launch wrongly" into main