Merge "Updating timeout for Per-App CTS"