Trebuchet : Update renamed ids

Update cling text ids for all layouts

Change-Id: I8efd5cb882a42bdefc764bc6ed0c75ba75eff7a2
Merge "Trebuchet : Update renamed ids" into cm-10.2
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2