Merge "Respect minimum dimensions for embedded Activities" into tm-dev