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