Merge "Allow hidden apps to opt-out" into jb-mr2-dev