am a0166b58: Merge "Activity chooser "Always" button is not working"

* commit 'a0166b58de38e0d2d67f9d847d307cf3ce7bf633':
  Activity chooser "Always" button is not working