Merge "DreamManagerServiceTests: Increase testForceStopStubbornDream timeout"