Merge branch 'fix/developer/9296-9297-9298-9299-9300-compiler-warning-tweaks' into fix/developer/9302-double-add-of-keyboard_info