Cherry-pick two fromlist commits required by protocols serialization#2871

rlubos merged 2 commits intonrfconnect:mainnrfconnect/sdk-zephyr:mainfrom

Damian-Nordic:ps_fixesDamian-Nordic/sdk-zephyr:ps_fixesCopy head branch name to clipboard