Merge "Fix folder app icon truncation after rotating to landscape." into tm-dev