Merge "Fix taskbar linger above notification shade" into tm-qpr-dev