Merge "Adjust restricted lock positions as per new design." into nyc-dev