Merge "Fix crash on devices with 1.2" screens." into nyc-mr1-dev