Merge "Using an independent drawable for rounded corners" into sc-dev