Merge "Remove VrFlinger usages from SF."