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

Change-Id: I4938f7403a62375e8a526e302d752c5a6e2c65b3