Merge "Correcting Logic of touch ouside of container." into main