Merge "Update extra defend layout string" into tm-qpr-dev