Merge "Do not enforce unlocked state when there is no caller" into nyc-dev