Merge "Also inform activity manager that lock task packages changed"