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

* commit '1b79c5c804e53fc63f602a5c4dcd876a0d2c7ab9':
  Allow hidden apps to opt-out