Merge "Moving brightness slider lower in split shade" into tm-dev