Merge "Add null checks to browser callbacks" into rvc-dev