Merge "Revert "Fix lock pattern is truncated during SUW in folded state"" into udc-qpr-dev