Merge "Properly remove GhostViews when Activity Transition canceled."