Merge "Fix deadlock between activity manager and settings provider"