Merge "Revert "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #5."" into rvc-dev