Merge "Fix divider visibility issue on transient taskbar" into tm-qpr-dev