Merge "Add GetBrightness()" into devel/master