Be sure to shutdown the proximity sensor after display wake

This fixes:
http://review.cyanogenmod.org/#/c/66657/

Change-Id: I1768f13cb48c3e056d0e137642690fc3d650c4ab
Make triggered profiles stackable.

Change-Id: I5666fe107d3749f48cd6ba7a45a3d0ccaf42de40