Merge "Fix notifications trimmed when unfolded on keyguard" into tm-dev