Merge "Adjust light source for window position" into mnc-dev