Merge "Fix NPE when mDecor is null on ActivityClientRecord"