Merge "Send onFrameRendered differently depending on whether the surface is a display" into udc-dev