Merge "Cover screen pinning logic around task bar" into tm-dev