Do not show settings button show quicksettings button instead

Change-Id: I8aa1b6577c6379a8d8d32c6d80a4dfdc7c9efa93
Merge "Do not show settings button show quicksettings button instead" into jb4.3