Merge "Fix black screen flashing during sip calls" into klp-dev