Merge "Enabled (asymmetric) tab selection in GridView" into oc-dev
am: 3653aed87b

Change-Id: Icffef176e1dc3de49191414e57fdf38c4073bff2