Merge "Fixed the reference to the compat version of the widget. Revised the class description." into tm-dev