Merge "Ensure the above-top finishing activity is invisible" into tm-qpr-dev