Merge "Block split Activity in lock task mode" into sc-v2-dev