Merge "Add Flag for overlapping Heads-up Notification bug fixing" into udc-qpr-dev