Android Studio: Add Git to the VCS settings

Change-Id: Iab936f385fc5580fd4f17cab4e032db17a889643
Wrap quick connect bar in layout

On Lollipop, this would otherwise result in an EditText that was cut off
by the layout.

Change-Id: I0c116aaf5b86da0409b57d3c89efa7f60b3b2160
Merge branch 'master' into gradle-conversion