Merge "Clean up permissions when system app fails to scan" into rvc-dev