Merge "Revert "Make getStateDescription() in View none final""