Merge "Add checks for nullable mVariables in SearchViewManager." into rvc-dev