Merge "Fix heads-up notification clipping in split shade" into tm-qpr-dev