Merge "Device displays fingerprint enrollment after swiping back" into tm-qpr-dev