Merge "Scale folder if it doesn't fit the screen" into tm-qpr-dev