Merge "Revert "Fixed animation breakage when QS area tapped during expand/collapse"" into tm-qpr-dev