Merge "Draw rounded corners when layers have them"