Updates for remix-staging

-For main branch: Track LockClock from pac and Contacts common