Merge "Use correct background for selected items."