Merge "Make `shell ime reset` work again for bg users" into main