Merge "Updates internal lock task mode state early" into rvc-dev