Merge "wmshell: use Lazy<> for CompatUI dependencies" into main