Merge "Increase the max height of Heads Up notifications." into sc-dev