bugfixes: no black screen, no double kick at beginning

Change-Id: Iadfd58d1fedbd4091e737a27a99fc5ce4735a56c