Merge "Fix WindowManagerShell for use_resource_processor: true" into main