Merge "Only collapse stack on shade state change" into tm-qpr-dev