Merge "Fix on click listener for the inline suggestion, and some refactoring."