Merge "Enforcing grid customization permission in manifest instead of code" into main