Merge "Avoid overlap when fading notifications in" into sc-dev