IMHO, we should split this in two PRs.

One for the info screen and another for the unlock, to the review will be clear and easy to maintain in case of back out.