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