Review and integrate open169b

[charlesh88]

open #169
Per comments in #358, adjusted desktop breakpoint to 1025. We still need to have a better overall strategy for determining mobile context, but this should help prevent breakage in the short-term on small desktop screens.

Author checklist:

• Changes address original issue? Y
• Unit tests included and/or updated with changes? N/A
• Command line build passes? N/A
• Expect to pass code review? Y

[akhenry]

Looks good, and seems to resolve the issues I was seeing on my retina screen.

Reviewer Checklist

• Changes appear to address issue? Y
• Appropriate unit tests included? N/A
• Code style and in-line documentation are appropriate? Y
• Commit messages meet standards? Y