Merge "Allow system info to be set visible even if we don't animate" into tm-d1-dev