Merge "Fix alpha fading in System UI"