Merge "Only enforce return animations when going to Launcher." into main