Merge pull request #1314 from iNavFlight/osd-ids-rearrange