Merge "If COLD startup occurs while launcher is backgrounded, do not wait until user goes to home to end startup session." into main