Merge "Fix issue with where display is removed while creating it in AM and WM" into pi-dev