Merge "[DO NOT MERGE]Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6."" into rvc-dev