Merge "Fix that symbol at top left corner mismatch with remaining options in vision settings." into tm-dev