Merge branch 'android/studio-beta' into issue/278-tablet
Merge remote-tracking branch 'github/issue/278-tablet' into issue/278-tablet