Merge "Add option to show the splashscreen from 'adb shell am'"