Merge "Fix screen attention contextual card" into qt-r1-dev am: 03c47e7687
am: 02777d3e1b

Change-Id: I5acfcf2d99d1e5652cce1d552aa28b7369f8f516