Merge "Fix scale for translucent activities" into tm-qpr-dev