Bug 1059967 - Updating SHB to conform to UX v1.0 spec
Merge pull request #23646 from eliperelman/bug-1059967

Bug 1059967 - Updating SHB to conform to UX v1.0 spec r=etienne