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

Change-Id: I876f3aa621122a4108d12fb35907dfa4c1a28df9