Minor refactor and improvement to common extended header population. Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>