Merge "Fix bug #15086008 NPE observed after user setup device daydream followed by device orientation"