Merge "Fix input in new handle menu layer." into main