[automerger skipped] Merge "Fix setting night mode and change test crashes EKS" into pi-dev am: 5238ebf05e
am: 1cf09ac7d7  -s ours

Change-Id: Iaf0b29d0c7700675164b2fd6ca77eccef8b1e8bf