Merge "Wait for DPM#setLockTaskPackages to apply changes" into rvc-dev