Merge "Add settings button to notification panel."