Merge "Fix black screen when finish FallbackHome"