ROMControl: Fix isSW600DPScreen

Landscape previously caused swdp600 to falsly
    return true (and removed preferences that
    said device should have)

PS2: Whoops uploaded unrelated file

Change-Id: Id37aab3811f247a59f7d7f6845085c296be68e43
Merge "ROMControl: Fix isSW600DPScreen" into jb-mr2