Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev