Merge "Merge "Always save long screenshot temp file to the same place" into sc-dev am: 4bb1104c am: 4b54abdb" into sc-v2-dev-plus-aosp