Lps 38391 fix staging remote

Hi Mate,

I saw that after some commits from LPS-38391 with the new Look & Feel for Staging, it was impossible to publish to Live.

Basically I fixed some conditions that after refactoring doesn't make sense (and caused some parts/messages not appearing and buttons appearing when they shouldn't).

Please tell me if you see something wrong.

Thanks!