Merge "Disable blurs when dev setting or battery saver" into sc-dev