Separate ambient display triggers
am: 82829ee0b1

Change-Id: I9f58e13648def7e982ce2966e789147d07b14f62