Merge "[Bug] reverse: don't reset screen mode in RSA ." into 2.0_beta