Merge "Make Pip usage of FrameCallbackScheduler an actual class"