WIP: Attempt at fixing light issues across multiple screens

Change-Id: Ice7b101e9fa27b7f71cc8d3805384852f52c9a77