Merge "sysui: refactor scrim controller" into nyc-dev