Merge "Avoid wm<->am deadlock when checking uri permission" into rvc-dev