Merge "Fixes styles of App Ops dialog"