Merge "Wrapping remote app animations"