Merge "Remove the frame number from WindowManagerService"