Merge "Don't assert bars location when display is off" into tm-dev