Merge "Flip ENABLE_DYNAMIC_PERMISSIONS, attempt #6."