Merge "[Bug] fix 'reset settings' view issue ." into 2.0_beta