Bug 865798 - Use browser size instead of device size

WIP - not sure if this is the approach we want to take or not.