Merge "Make PendingIntent immutable and correct Settings package name" into rvc-dev