Merge "Window can only be fully drawn if app window is not relaunching" into oc-dev
am: f7e6f581c0

Change-Id: I9556d5c24d9192674338cbcf45cd042e02740a73