am 893bdcd5: am 1b79c5c8: Merge "Allow hidden apps to opt-out" into jb-mr2-dev

* commit '893bdcd5312f314da7925f22345cb4efe0e1c442':
  Allow hidden apps to opt-out