Merge "Fix letterbox flickering rounded corners." into tm-dev