better pushback + snap-to-edges for incomming notifications

Change-Id: I3e5b96003485bcad0fc2b029a8b735bf9da6c58e