Merge "Remove temporary logging for NO_SCREENSHOT bug/." into sc-v2-dev