Merge "Add handle input fix to developer options." into main