Frameworks: Reconcile with Latest listview and some fixes

Change-Id: Ic035b2c386e39d3625dfd66c7c10f0e7cc3f053c