Merge "Notif manager and captive portal app to read SSID again" into pi-dev am: 249b1a34c3
am: 9cb91ef301

Change-Id: I588fedba49ea5d08e40bd2b3ea8ba2c2383958ec