Merge "Use adaptive icon in Settings" into rvc-dev am: 80b0169507

Change-Id: I341f4bbbb54a3bc6933d8bde64c4502d6b929f03