Merge into dev as well

Merge changes into dev branch that were just merged from mobilelayout into master.