Merge "Changing dimensions and margins for fingerprint image in portrait mode. Landscape layout remains the same with fixed size." into nyc-dev