Merge "Fix issue #8647812: Hide app ops choice from settings shortcut" into jb-mr2-dev