Merge "[pm] fix potential NPE during permission check" into rvc-dev