automerge: 0ae5f60
* commit '0ae5f6037b68794dc8a394c24a6ec8413c97555f':
Screen pinning: fix strings and add scrollview
automerge: 0ae5f60
* commit '0ae5f6037b68794dc8a394c24a6ec8413c97555f':
Screen pinning: fix strings and add scrollview