Merge "Disable blurs during battery saver mode" into sc-dev