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