Merge "Revert "Prevent setting mIsStashed in TaskbarStashController"" into udc-qpr-dev