Merge "Bug 7301303: more rows in all apps for sw720dp-port" into jb-mr1-dev