Merge "Don't set up external displays from binder thread" into klp-dev