Merge "Proper fix for vr_wm: the hwc_callback function is no longer called"