Merge "Add a no-op animation for non-changing apps during change transition"