Merge "Fix onCurrentVrActivityChanged callbacks."