Merge "Set initial crop handles to original page location" into sc-dev