Merge "Fine tune performance for notifyContentCapture()" into rvc-dev