Fix the settings panel freeze

When one of the list items are selected from the settings panel
then the whole panel freezes until either the app is restarted or
the entries are long clicked.

This is reproducible on any HDPI devices even with the Official
Gallery app from Google.

Change-Id: Ifc8b6703dbc698d288a5163ff2d3ce20decf254d
Merge remote branch 'cm/cm-10.1'