Bug 1074608 - Fix permission prompts with SHB button
Merge pull request #24637 from mikehenrty/bug-1074608-shb-permission

Bug 1074608 - Fix permission prompts with SHB button