Merge "Avoid ANR when UI query network selection state" into tm-qpr-dev