Merge "Fix issue where NOT_VISIBLE state is sometimes not logged" into sc-v2-dev