Merge "Update list selector background (disabled state)" into ics-mr0