Merge "Check for forceVisible when updating from a new status event" into sc-dev