Merge "Use theme attributes for dual tone icons" into qt-dev am: f16a0d46bb
am: 2029300084

Change-Id: I26e33d5abe64024a2c4613ce4e207d78abf5fd76