Merge "Support for <compatible-screens><screen> in ADT." into gingerbread