Merge "Revert "Add lockTaskOnLaunch attribute.""