Merge "WM/ViewRootImpl: Fix convertFromTranslucent to respect existing state." into qt-dev am: 87b66465b6
am: c29d0dcafc

Change-Id: Ic8ea290722ab2a1490265bfd5512479a75b1ba68