Issue #2843707 by Chirag_Garg, lokapujya, xjm, gerzenstl: Default config for entity displays does not match what is saved