Merge "Fix More details not work on fingerprint" into tm-dev