Merge "Show split option without consider the "Lock task mode"" into tm-qpr-dev