Merge "Fix opacity issue when we use corner radius" into devel/master