Settings/toolbar: derp in show/hide feature
Merge remote-tracking branch 'upstream/jb43' into jb43
Merge branch 'jb43' of https://github.com/jesse131/android_packages_apps_Settings into jb43