Merge "correctly mount tmpfs as /tmp in recovery"