Merge "Prevent showing divider if launcher was never shown" into tm-qpr-dev