Merge "Align the behaviour of different lock task modes" into mnc-dev