Merge "Remove @Nullable from AppCompatActivity#findViewById" into nyc-dev