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

Change-Id: Iab7c0bc2cd74ecb7f60c3f047bc0597edd476bbf