Merge "Accomodate brightness space change for client target" into tm-dev