Also fixes broken VerticalGridFragment. And cleanup. b/16354712 Change-Id: I348ab42230d88bac8192b5421e76a58b28ca6616