Merge "Make prefs without an action unselectable" into nyc-dev am: 9121169dca
am: a015e6ca16
am: 0f008bf7e6
* commit '0f008bf7e675a168744bd41b0509a4969d17b341':
Change-Id: I5355d79df7f9965d68d87cbb023c50ff4e95b91f
This commit is contained in: