Merge "Refactor SysUI to allow daggerization of implementations"