Merge "Add shell control for disabling blur" into sc-dev