Merge "Revert "Don't request PIN field focus again unless re-enabled"" into sc-dev