* commit '940138de9eae9be9ef60307af9e5f7a1168af533': Fix 4462497: Move layouts from xlarge to large to enable 7" tablets