Merge "Add APIs for notification app overlays"