LPS-39497 - User is unable to select layout by clicking on icon or label

Hey @natecavanaugh,

Attached is an update for http://issues.liferay.com/browse/LPS-39497.

NOTE: This pull request relies upon https://github.com/natecavanaugh/liferay-portal/pull/1624.

Please let me know if you have any questions.  Thanks!