Merge branch 'android-tabs'