Merge "Add circular ProgressBar style" into devel/master