Merge "Checkpoint work on the Tag app." into gingerbread