Merge "Fix caching flickering for unsecure displays" into sc-dev