Merge "use different description strings for screen attention settings and...
Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev am: d81e2c36
am: b7098b18
Change-Id: I6cbea478176361733957adb06e63f1e9b58f1c8b