Merge "Fix issue with where display is removed while creating it in AM and WM"...
Merge "Fix issue with where display is removed while creating it in AM and WM" into pi-dev am: 91059cdf
am: 14bcfc7a
Change-Id: Ie035716751da65aabfe10320ac1019a1fc9f7e12