Merge "Using FrameCallbacks instead of windowCallbacks for surface removal" into ub-launcher3-master