Merge "Fix stale background blur drawable in DecorView" into sc-dev