Merge "Fix incorrect updating of headers in Settings" into jb-dev