Merge "Split auto dismissing functionality from heads up"