Merge "Add useVrFlinger() method to SurfaceFlinger ConfigStore"