Merge "Don't check height if activity bounds empty" into tm-qpr-dev