Merge "Public API for android.widget.Switch properties"