Merge "Add edge-to-edge effect for grid picker" into sc-dev