Merge "Make sure we've finished loading settings before processing any reloads" into klp-dev