Code review markups for fixing device selection on fresh install