Merge "Fix flash of ambient on fp unlock" into oc-dev