Merge "Allow user move/copy more than 500+ items." into oc-dev am: ffa81dc40b
am: 98b8f7e611

Change-Id: I26387e78561937608ab7f73482493733883e0de8