Merge "Fix activity scene transition"