Merge "Fix wrong bar state after swiping home" into main