Merge "Retain udfps auth bouncer after orientation change" into sc-qpr1-dev