Merge "[entry] remove autoenable_returnkey code"