Merge "Make Android Studio Instant Run work again"