Merge pull request #8044 from andyque/fixWarnings

fix UI related warnings