Merge pull request #8864 from frsela/STK/Bug854792

Bug 854792 - [Buri][Settings]it will always go into SATK menu when open settings, r=kaze(cherry picked from commit 35c12720bfe8b9aa35bb5abfb39cc6c8bb146226)
Merge pull request #8965 from frsela/FixLint

Bug 854792 - [Buri][Settings]it will always go into SATK menu when open settings, r=kaze(cherry picked from commit fcfe81c9181e39e8632afa20b1a7fda0f643b308)