Merge "Pass an appropriate default style up the constructor chain" into lmp-mr1-dev