Merge "Fix security whole in lock task" into mnc-dev