Merge "Enable input field zoom" into 2.0_beta