Merge remote-tracking branch 'origin/24220_locked_icon_saved_list' into develop

Conflicts:
	app/assets/stylesheets/application.scss