Merge "Add lost mode platform changes"