Merge "Improve locking granularity for PAN and Input."