Merge "Fix sometimes mExpandedView will appear while screen transforming."