Merge "Fixing crash when activity doesn't have a window" into sc-v2-dev