Merge "Fix divider disappear when rotation on shell transition" into tm-dev