Merge "make device setting be able to use both Intent and PendingIntent" into main