Merge "ViewRootImpl/SurfaceView: Listen for queue stalls" into tm-dev