Merge commit 'e2522466' into froyo-plus-aosp * commit 'e2522466': Fix issue #2547337: switching night modes