Merge "Remove inconsistent font-family declarations"