am c765f3b5: am 3f24678f: Merge "Force activities to run on the second display...
am c765f3b5: am 3f24678f: Merge "Force activities to run on the second display for testing." into jb-mr1-dev
* commit 'c765f3b5':
Force activities to run on the second display for testing.