Merge "Explicitly set onClickListener on expand button"