Merge "Fix parenthesis to prevent hidden feedback icon from calling click listener"