Merge "Lock the pulling alarm handler." into pi-dev