Merge "Fix a deadlock in system server" into nyc-dev