Code cleanup and improve lockscreen notification

Change-Id: I8d75eb4ee110890808569c5b991e4ef11e26f9d8