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

Change-Id: Ief8dd5c19f4aa3eda1912016649eda767d108d01