Merge "Pass current brightness parameter to libtonemap"