Merge "Remove gap applying night display and color mode"