Merge "Forced all ControlWrapper instances to ignore styling" into devel/master