Merge "Fix a race where NLP consent dialog can be shown unnecessarily" into lmp-mr1-dev