place feedback icon lower, only if it really need
merge in and resolve conflicts
Merge branch 'master' into pr/14005