Merge "Fix 5404916: Make layout fit on 480x800 hdpi device" into ics-mr1