Merge "Call minikin::getBounds instead of using Layout."