Merge "Fix the selected option not saved for App List"