Merge "Not specify return val of View#onSaveInstanceState" into oc-dev