Merge "Making the screenshot filename smaller to fix issue on certain platforms."