Merge "Merge "Add null checks to browser callbacks" into rvc-dev am: 31a8993720 am: 8033376766 am: f1381e3ff9" into rvc-qpr-dev-plus-aosp