Merge "Show signal sender for SI_FROMUSER signals." am: b802255b06
am: 8584ffe608

Change-Id: Ic6b540e6cc482913ced53a683f44c2d47b594422