Merge "Update fingerprint layouts for landscape" into sc-dev