Merge "Part 2 of removing shade blinking while moving heads-up notification" into tm-qpr-dev