Merge "Remove SessionState and cookie from biometrics" into sc-dev