Merge "Fix a NPE when rotating dialog created by DialogCreatable."