Merge "Fix ListView can not be moved after rotation." into oc-mr1-dev
am: 10477217f5

Change-Id: Ifb68ab61a474a559586b6ad76a6b25cc6fd167d3