Merge "Need to check current user when triggering notification lights" am:...
Merge "Need to check current user when triggering notification lights" am: 819d39bf am: 5fc7c9d6 am: 7200f667 am: 39333aa1
Change-Id: I1765f0f2419fa4e8759649fbfaaf773d6956393c