Merge "Fix udfps flicker on camera launch + exit" into sc-qpr1-dev