Merge "Register PixelArea property only if required." into devel/master