Merge "make device setting be able to use either Intent or PendingIntent" into main