Merge "Start all resolver activities after keyguard is gone" into lmp-dev