Merge changes Ic92e29c6,I6e044606 into rvc-dev

* changes:
  Null check on permission request check
  Pre-cache filter results