Merge "Move shelf config setting into SystemUI"