Merge "Update notification blocking ui theming" into sc-dev