Fixed issues with some features only being available based on the nRF Connect SDK version instead of Zephyr's. Fixed issues with quick pick menus that would not close.