Merge "Revert "Send display-OFF event if that is initial state."" into sc-dev

                                setDisplayState(Display.STATE_ON);

                                currentState = Display.STATE_ON;

                            } else {

                                if (oldState == Display.STATE_UNKNOWN) {

                                    // There's no guarantee about what the initial state is

                                    // at startup, so we have to set it if previous was UNKNOWN.

                                    setDisplayState(state);

                                }

                                return;

                                return; // old state and new state is off

                            }

                        }