Merge "fix datetime layout for phones and remove orientation locking" into ics-mr1