Merge "Do not add jank monitor for stash state change when the drag layer is not attached to the window" into main