Merge "Add keep_memtag_mode extra to FACTORY_RESET intent" into main