Merge "[Settings] Avoid popup activity get bringup from recent history" into tm-dev