Merge "Revert "Add ActivityOptions for SecondDisplayLaucher to launch activity""