Merge "Avoid extra relaunch when rotating side-by-side apps" into nyc-dev