Merge "Fix TaskView over lockscreen" into tm-dev