Delayed quick adjust
Merge branch 'quick-adjust'

Conflicts:
	res/layout/player_list_item.xml