HELP! Set Foreground Color/Set Background Color inconsistent in Action

** I am literally going insane with this issue! **

I'm trying to get two actions to run and make life easier for retouching. One is a paint-on effect and the other is the opposite paint-off effect. Also, I am trying to set the foreground and background colors so that my brush is ready to apply the effect whether I'm painting on or off.

Notes: 

• Everything was fine with my action until version 21.1.1
• I can confirm the action still runs fine in version 20.0.9
• Downgrading to 20.0.9 is not a viable solution
• I am running Mac OS 10.15.3

My PAINT-ON Action Runs like this:

1. Set the Foreground Color to White (RGB 255:255:255)
2. Set the Background Color to Black (RGB 0:0:0)
3. Make a Fill Layer (Solid RGB Color)
4. Set Current Layer to Soft Light
5. Set Current Layer to 25% Opacity
6. Select Mask Channel
7. Invert
8. Select brush

My PAINT-OFF Action Runs like this:

1. Set the Foreground Color to White (RGB 0:0:0)
2. Set the Background Color to Black (RGB 255:255:255)
3. Make a Fill Layer (Solid RGB Color)
4. Set Current Layer to Soft Light
5. Set Current Layer to 25% Opacity
6. Select Mask Channel
7. Select brush

The problem I am encountering in v.21.1.1 (and not in 20.0.9) is that the Set Foreground Color and Set Background Color is completely random/non-functional/infuriating. Yes, I'm aware I can just use the keyboard shortcut to swap the pallets, but I never had to do this before. I want two distinct actions like I have always had and I cannot figure out why the behavior is changed.

I've also had to change the action already in 21.1.1 to accommodate weird behavior I've never had to deal with before - unless Set Foreground Color and Set Background Color were the first steps in the action, the Set Foreground Color would change the FILL LAYER! 

Can anyone reproduce this issue? (I created a download here: https://bit.ly/2X44n2r)
Can anyone offer a workaround?