Merge "Make the booting flag update unconditional" into klp-modular-dev