Merge "Add logging for shade expand/collapse/qsExpand" into tm-qpr-dev