Merge "Update enableTaskbarNoRecreate logic" into main