Merge "Clean up RotateDrawable, add getters and setters for XML properties"