Merge "Fixing the customize drawer tabs on large devices"