Merge "Properly handle situation when currentOpPackageName returns null." into rvc-dev