Merge "Don't navigate to lockscreen on FP failures when dreaming" into udc-qpr-dev