Merge "Fix udfps flicker on camera launch + exit"