Merge "Fix issues with TRON app transition logging"