Merge "No longer need to explicitly hide/show list."