Merge "Remove wtf if no display nits mapping exists"