Merge "Fix fluctuating notification height during shade open" into sc-dev