Merge "Add settings intent dialog (framework)"