Merge changes I688af1ff,If1f2e1a1 into main

* changes:
  Override tag intent preference settings if blocklist changed
  Default disallow android tag app