Merge "Support for rounded corners with nine-patch shadows." into lmp-mr1-ub-dev