Merge "Set exact night display last activated time" into qt-r1-dev
am: 95ebd376f0

Change-Id: I7127ea387c7f276937fa69712b28a79bdba3e471