Merge "SF: Fix jank after folding due to power sequence" into udc-qpr-dev