Merge "Limit notification scroll up to status bar" into sc-dev