Merge "Fix issue #8768456: Settings > App Info under reports..." into jb-mr2-dev