Merge "Update auto-rotate strings/toggles for better accessibility" into tm-dev