Merge "Fixing notifications not visible in split shade after rotations" into tm-dev