Merge "Removing some tiling options for tablet usage"