Merge "Fix transition filter for returning home transition." into main