Merge "ADT: fix spurious SDK refresh when opening layout editor." into idea133