* commit '9861973c0beba15ee216e88bda7723cb01b02d63': Fix bug 3312807 - Fix child margin measurement in FrameLayout