Merge remote-tracking branch 'origin/master' into preference
refactoring isXLargeTablet
Merge remote-tracking branch 'origin/preference'