Merge "Camera: use wp for NotificationListener" into nyc-mr1-dev am: eb2c7c3726 am: b4ad8faa17
am: 1ec4e483d8

Change-Id: I8a9f82e4a9b2aa1564a5a5ce9070ce31116111e1