Merge "Fix bug where lockscreen notification is minimized and not dismissable" into sc-dev