Merge "Added a DeviceConfig property for Content Capture idle timeout to unbind from system server."