Merge "Increase the maximum height of notifications by 20%" into sc-dev