Merge pull request #9065 from etiennesegonzac/bug-858722-settings-permissions-fix

Bug 858722 - Fixing the busted permissions panel of the settings app, r=kaze(cherry picked from commit 782e588ef0980ddef6a93feb4270619c3a2f777c)
uplift -- bug 828890 (+858722): Scroll bar should not go over the header
Merge pull request #9152 from fabi1cazenave/uplift-bug828890

Bug 828890 — uplift to v1-train