Merge "Remove BaseFragmentActivityApi24 and move multi-window methods" into nyc-dev