remove mbp15 specific settings
set scroll offset
Merge commit '65c08577537b2b66d915da8b80e625deb5333354'