Merge "Fix atrace saveLayer flag logging"