Allow switching to tablet style UI for phone and phablet devices. [1/2]

Change-Id: Id78a115d3d13811d13dacd6d8cccac119fd8a829
Merge remote-tracking branch 'github/jellybean-mr1' into jellybean-mr1