Merge "Cleanup taskbar+assistant interactions" into tm-qpr-dev