Merge "Fix black screen bug"