Merge "Fix Letterboxing for Transparent Activities" into tm-qpr-dev