Merge "Pause infinite AVD when the drawable is not visible" into nyc-dev