Merge "Fix clickable notification row elements" into rvc-dev am: e7979623e6 am: 61951855f1

Change-Id: Iece77aa203e22040b39eeefcab8c71dd65b268a2