Merge "Fix black screen on app transition."