Merge "DO NOT MERGE: Disable ENABLE_DYNAMIC_PERMISSIONS without helper method." into rvc-qpr-dev