Merge "Fix blockable system notifications" into tm-dev