Apply fix for bug #7247 to the mobile-samples version of ContentControls