Merge "Moved check for level  after check for resolution change."