Merge "Fix lockscreen notification + media counting." into sc-dev