Merge "Fix 6847667: remove custom layout for 720dp device"