[PATCH 0/3] Backport uclamp vs margin fixes into 6.1.y