Merge "Clear input focus when Return/Escape key Up" into devel/master