Merge "API: Work around wfMangleFlashPolicy()"