Merge "Add per-package lock in setAppFunctionEnabled." into main