Merge "Fixing top notifications cut off on the lockscreen" into tm-dev