Merge "Fix race condition when entering low persistence mode" into oc-mr1-dev

                        }

                        // If the state change was from or to VR, then we need to tell the light

                        // so that it can apply appropriate VR brightness settings. This should

                        // happen prior to changing the brightness but also if there is no

                        // brightness change at all.

                        // so that it can apply appropriate VR brightness settings. Also, update the

                        // brightness so the state is propogated to light.

                        boolean vrModeChange = false;

                        if ((state == Display.STATE_VR || currentState == Display.STATE_VR) &&

                                currentState != state) {

                            setVrMode(state == Display.STATE_VR);

                            vrModeChange = true;

                        }

                        // Apply brightness changes given that we are in a non-suspended state.

                        if (brightnessChanged) {

                        if (brightnessChanged || vrModeChange) {

                            setDisplayBrightness(brightness);

                        }