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