Merge "Renamed Activity class multi-window APIs"