Merge "[Fingerprint] Define margins in fingerprint theme"