Merge "Try to fix rounded corner overlay issue"