Merge "Fix the secure flag check for blackout layer issue"