Merge "Fix failed testManageSpacePendingIntentNoBalAllowed for secondary_user_on_secondary_display" into main