LSN: double-remove fix: hard derp

Change-Id: Ic1abb6c3cd2f1026ed23873ab8c663374229dc76
LSN: avoid re-concatenation of notifications' mNotifications key

Change-Id: I3ba60f92698548dc2ef50e82f5f4c9279357e182
ActiveDisplayView: fix non-pocket mode

Also inline some trivial methods and despaghetti-clusterfuck some
more code

Change-Id: I2b20d875171689d08629c79c5fa564eb0443606c