Merge "Make Settings show in two-pane on portrait tablet" into tm-qpr-dev