Merge "DO NOT MERGE Don't send config change when display is removed" into pi-dev