Merge "Fix notification group scroll in split shade" into tm-dev